Clean up the usage of CFLAGS. This is nice for packagers, who would

like to control the base compilation flags from a central place.

Signed-off-by: Charles Coffing <ccoffing@novell.com>

diff --git a/Config.mk b/Config.mk
index 6f48d6493c8b51278f3ea45526834abffeb849e1..180f932fc1dfeec874d67717339dc619713a6f5f 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -40,6 +40,8 @@ endif
 
 test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2))
 
+CFLAGS += -Wall
+
 HOSTCFLAGS += $(call test-gcc-flag,$(HOSTCC),-Wdeclaration-after-statement)
 CFLAGS     += $(call test-gcc-flag,$(CC),-Wdeclaration-after-statement)
 

diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile
index d61c407c03545605ae25b28f9fe08c29440e9150..6f19e79f3fd5d5867f4edfce4abf7e8e97976986 100644 (file)
--- a/tools/blktap/Makefile
+++ b/tools/blktap/Makefile
@@ -22,7 +22,6 @@ LIBS     := -lpthread -lz
 SRCS     :=
 SRCS     += blktaplib.c xenbus.c blkif.c
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
 #CFLAGS   += -O3

diff --git a/tools/blktap/parallax/Makefile b/tools/blktap/parallax/Makefile
index c61b684c002ae75aab8871b005f15f03523a802b..d2cc0ee6244e315e308dd34c51f4c48581825dde 100644 (file)
--- a/tools/blktap/parallax/Makefile
+++ b/tools/blktap/parallax/Makefile
@@ -31,7 +31,6 @@ VDI_TOOLS += vdi_fill
 VDI_TOOLS += vdi_tree
 VDI_TOOLS += vdi_validate
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
 #CFLAGS   += -O3
@@ -58,7 +57,7 @@ parallax: $(PLX_SRCS)
        $(CC) $(CFLAGS) -o parallax -L.. $(LDFLAGS) $(PLX_SRCS)
 
 ${VDI_TOOLS}: %: %.c $(VDI_SRCS)
-       $(CC) $(CFLAGS) -g3 -o $@ $@.c $(LDFLAGS) $(VDI_SRCS)
+       $(CC) $(CFLAGS) -o $@ $@.c $(LDFLAGS) $(VDI_SRCS)
 
 .PHONY: TAGS clean install rpm
--include $(DEPS)
\ No newline at end of file
+-include $(DEPS)

diff --git a/tools/blktap/ublkback/Makefile b/tools/blktap/ublkback/Makefile
index 48d2bbfe4ba315fffbaf3902d5e809ef3d41e98c..d6083478e9a0dea283fceec09279674fd941c9f9 100644 (file)
--- a/tools/blktap/ublkback/Makefile
+++ b/tools/blktap/ublkback/Makefile
@@ -9,7 +9,6 @@ INSTALL_PROG = $(INSTALL) -m0755
 IBIN         = ublkback
 INSTALL_DIR  = /usr/sbin
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
 #CFLAGS   += -O3

diff --git a/tools/console/Makefile b/tools/console/Makefile
index a27aa8e458e1026363ad094fab8074936bfe6117..206621d083fd916699b66bd3513f13685a15bba4 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -9,7 +9,7 @@ INSTALL         = install
 INSTALL_PROG    = $(INSTALL) -m0755
 INSTALL_DIR     = $(INSTALL) -d -m0755
 
-CFLAGS  += -Wall -Werror -g3
+CFLAGS  += -Werror -g
 
 CFLAGS  += -I $(XEN_LIBXC)
 CFLAGS  += -I $(XEN_XENSTORE)

diff --git a/tools/debugger/libxendebug/Makefile b/tools/debugger/libxendebug/Makefile
index 0d8881ad4970152a11c49ead2a4e800d24fb9b8f..17088021160952602c95c3183145a2042cf7af3d 100644 (file)
--- a/tools/debugger/libxendebug/Makefile
+++ b/tools/debugger/libxendebug/Makefile
@@ -14,7 +14,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 SRCS     := xendebug.c
 
-CFLAGS   += -Wall -Werror -O3 -fno-strict-aliasing
+CFLAGS   += -Werror -O3 -fno-strict-aliasing
 CFLAGS   += $(INCLUDES) -I. -I$(XEN_ROOT)/tools/libxc
 # Get gcc to generate the dependencies for us.
 CFLAGS   += -Wp,-MD,.$(@F).d

diff --git a/tools/debugger/pdb/Makefile b/tools/debugger/pdb/Makefile
index 85f8beaff7deed94e99d1267c590668d66c3f234..1842ec7d0b2a68f898e4020b26e644147b055064 100644 (file)
--- a/tools/debugger/pdb/Makefile
+++ b/tools/debugger/pdb/Makefile
@@ -20,7 +20,6 @@ INCLUDES   += -I ./linux-2.6-module
 INCLUDES   += -I $(OCAML_ROOT)/lib/ocaml
 
 CFLAGS     += $(INCLUDES)
-CFLAGS     += -Wall
 CFLAGS     += -Werror
 CFLAGS     += -g
 

diff --git a/tools/ioemu/Makefile b/tools/ioemu/Makefile
index 0cb6ab5e5d75244a8de971e2fce2af97f66ab33e..bf3deef77b5806a3ee1632cd482d569b7e4130aa 100644 (file)
--- a/tools/ioemu/Makefile
+++ b/tools/ioemu/Makefile
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 -include config-host.mak
 
-CFLAGS+=-Wall -O2 -g -fno-strict-aliasing 
+CFLAGS+=-O2 -g -fno-strict-aliasing 
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif

diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile
index ac2774f14f773915d8a7cf01640d53f770ddde5a..40f68a10f6f4e399894dd40e2d9d63eb1aaad456 100644 (file)
--- a/tools/ioemu/target-i386-dm/Makefile
+++ b/tools/ioemu/target-i386-dm/Makefile
@@ -13,7 +13,7 @@ ifdef CONFIG_USER_ONLY
 VPATH+=:$(SRC_PATH)/linux-user
 DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
 endif
-CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS+=-O2 -g -fno-strict-aliasing
 LDFLAGS=-g
 LIBS=
 HELPER_CFLAGS=$(CFLAGS)

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 84d4829ecfc68b3349cb301327c6829ee9ff9f7d..3ec4c05d4e77f252dba662a8c45546e31e4ccbf1 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -48,7 +48,6 @@ BUILD_SRCS += xc_linux_save.c
 BUILD_SRCS += xc_hvm_build.c
 endif
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
 CFLAGS   += -O3
 CFLAGS   += -fno-strict-aliasing

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 69528685387724ca3fe213f1fb918c3c95941cac..70f8e9c675f56d0807bd550f2e71503be68e6383 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -5,7 +5,7 @@ INSTALL_DIR     = $(INSTALL) -d -m0755
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS   += -Wall -Werror -O3 
+CFLAGS   += -Werror -O3 
 
 INCLUDES += -I $(XEN_XC)
 INCLUDES += -I $(XEN_LIBXC)

diff --git a/tools/misc/cpuperf/Makefile b/tools/misc/cpuperf/Makefile
index 604e149b70649c79b5f97b0c7b6fad93c3826769..86b9c185feb9c5a4ea5c4097ab6051c6f6ce526d 100644 (file)
--- a/tools/misc/cpuperf/Makefile
+++ b/tools/misc/cpuperf/Makefile
@@ -17,7 +17,7 @@ INSTALL_DIR   = $(INSTALL) -d -m0755
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS      += -Wall -O3 
+CFLAGS      += -O3 
 
 HDRS         = $(wildcard *.h)
 SRCS         = $(wildcard *.c)

diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile
index 32d9db41a40c63fb25190644252d97fd5ec46b60..eed0c66951c021d3d268e28d14ef911ee729496f 100644 (file)
--- a/tools/misc/lomount/Makefile
+++ b/tools/misc/lomount/Makefile
@@ -6,7 +6,7 @@ INSTALL_DATA    = $(INSTALL) -m0644
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS  += -Wall -Werror -O3
+CFLAGS  += -Werror -O3
 
 HDRS     = $(wildcard *.h)
 OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))

diff --git a/tools/misc/mbootpack/Makefile b/tools/misc/mbootpack/Makefile
index 135c67d85d4ac3843b45948b92abacd97912e45c..d87aa8a838cedf23ecc23e46095a976d1cb72243 100644 (file)
--- a/tools/misc/mbootpack/Makefile
+++ b/tools/misc/mbootpack/Makefile
@@ -20,7 +20,7 @@ GDB   := gdb
 INCS   := -I. -I-
 DEFS   := 
 LDFLAGS        := 
-CFLAGS := -Wall -Wpointer-arith -Wcast-qual -Wno-unused -Wno-format
+CFLAGS += -Wpointer-arith -Wcast-qual -Wno-unused -Wno-format
 CFLAGS += -Wmissing-prototypes
 #CFLAGS        += -pipe -g -O0 -Wcast-align
 CFLAGS += -pipe -O3 

diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile
index a9ae844e843c7f7722d76283df0106635bbaadb4..6229d6b95b94f8529c5adbfa21c0703998218de9 100644 (file)
--- a/tools/misc/miniterm/Makefile
+++ b/tools/misc/miniterm/Makefile
@@ -1,9 +1,10 @@
+XEN_ROOT:=../../..
+include $(XEN_ROOT)/tools/Rules.mk
+
 INSTALL                = install
 INSTALL_PROG   = $(INSTALL) -m0755
 INSTALL_DIR    = $(INSTALL) -d -m0755
 
-CC     = gcc
-CFLAGS = -Wall -O3
 TARGET = miniterm
 
 all: $(TARGET)
@@ -16,4 +17,4 @@ clean:
        $(RM) *.o $(TARGET) *~
 
 $(TARGET): $(TARGET).c
-       $(CC) $(CFLAGS) -o $@ $<
+       $(HOSTCC) $(HOSTCFLAGS) -o $@ $<

diff --git a/tools/misc/nsplitd/Makefile b/tools/misc/nsplitd/Makefile
index c5c4c9ed40868dfc767b7dbce0a69f20195df028..8880ceabf7a760f2d0496808e4081f008082a128 100644 (file)
--- a/tools/misc/nsplitd/Makefile
+++ b/tools/misc/nsplitd/Makefile
@@ -1,6 +1,6 @@
+XEN_ROOT := ../../..
+include $(XEN_ROOT)/tools/Rules.mk
 
-CC     = gcc
-CFLAGS = -Wall -O3
 CFILES = $(wildcard *.c)
 
 HDRS     = $(wildcard *.h)
@@ -16,7 +16,7 @@ clean:
        $(RM) *.o $(TARGET) *~
 
 $(TARGET): $(OBJS)
-       $(CC) $(CFLAGS) -o $@ $^
+       $(HOSTCC) $(HOSTCFLAGS) -o $@ $^
 
 %.o: %.c $(HDRS) Makefile
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<

diff --git a/tools/security/Makefile b/tools/security/Makefile
index eefbd48a69915460dfeef90e2cf7dc99f07f05c8..ea12a8114749519f4737346f6e5580871a1dd68b 100644 (file)
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -1,7 +1,6 @@
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
 CFLAGS   += -O3
 CFLAGS   += -fno-strict-aliasing

diff --git a/tools/vnet/libxutil/Makefile b/tools/vnet/libxutil/Makefile
index d268b2cb3971b7146770a83044e223faa12d09bb..f6a5ca07803da18bd92e58d5d7185360af6b4b50 100644 (file)
--- a/tools/vnet/libxutil/Makefile
+++ b/tools/vnet/libxutil/Makefile
@@ -29,8 +29,7 @@ LIB_SRCS += util.c
 LIB_OBJS := $(LIB_SRCS:.c=.o)
 PIC_OBJS := $(LIB_SRCS:.c=.opic)
 
-CFLAGS   += -Wall -Werror -O3 -fno-strict-aliasing
-CFLAGS   += -g
+CFLAGS   += -Werror -O3 -fno-strict-aliasing -g
 
 # Get gcc to generate the dependencies for us.
 CFLAGS   += -Wp,-MD,.$(@F).d

diff --git a/tools/vnet/vnetd/Makefile b/tools/vnet/vnetd/Makefile
index b7347ed7da22be37edb3859304547f715031ce95..93482fa41975bad90398b6a6f1c4262ab2edf499 100644 (file)
--- a/tools/vnet/vnetd/Makefile
+++ b/tools/vnet/vnetd/Makefile
@@ -44,7 +44,6 @@ CPPFLAGS += -D __ARCH_I386_ATOMIC__
 #----------------------------------------------------------------------------
 CFLAGS += -g
 CFLAGS += -O2
-CFLAGS += -Wall
 CFLAGS += $(INCLUDES) $(LIBS)
 
 LDFLAGS += $(LIBS)

diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk
index 93b84cdaa5c4f48bb6cf455bceedbf04bd5a2e18..bc0d864c629299386dcafb5f0e82a75714cf3cbc 100644 (file)
--- a/tools/vtpm/Rules.mk
+++ b/tools/vtpm/Rules.mk
@@ -14,7 +14,7 @@ INSTALL_DIR     = $(INSTALL) -d -m0755
 TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
 
 # General compiler flags
-CFLAGS   = -Wall -Werror -g3 -I.
+CFLAGS   = -Werror -g3 -I.
 
 # For generating dependencies
 CFLAGS += -Wp,-MD,.$(@F).d

diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk
index c7395864ac4084785cf661a4eba5835b4eba623b..9644eba6bc49df4253a873177ea1f7a487c8416b 100644 (file)
--- a/tools/vtpm_manager/Rules.mk
+++ b/tools/vtpm_manager/Rules.mk
@@ -14,7 +14,7 @@ INSTALL_DIR     = $(INSTALL) -d -m0755
 TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
 
 # General compiler flags
-CFLAGS = -Wall -Werror -g3 -I.
+CFLAGS = -Werror -g3 -I.
 
 # For generating dependencies
 CFLAGS += -Wp,-MD,.$(@F).d

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index b7de270e07dac8e0cfc2b81b0383f8295f356931..5bf5f3d68a6a817b5e98b5b130d007d4565500eb 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -19,7 +19,7 @@ PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
 
 INCLUDES += -I $(XEN_LIBXC)
 
-CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
+CFLAGS += -Werror -O3 -fno-strict-aliasing
 CFLAGS += $(INCLUDES)
 
 # Make gcc generate dependencies.

diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index 6ff8391f9c45d2a6a9bfd355a2e008d0e2d6c2c2..ffdca8049ec65dfc654ebf026aede5de8e923dee 100644 (file)
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -20,7 +20,7 @@ sbindir=/usr/sbin
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS += -Wall -Werror -g
+CFLAGS  += -Werror -g
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)
 LDFLAGS += -L $(XEN_LIBXC)

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index e814d0f2e817802d5b072881103ea2ebfd524b2d..8179695fb52159e5ceaad58ee2d0feb83bce4938 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -6,7 +6,7 @@ INSTALL_DATA    = $(INSTALL) -m0644
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS  += -Wall -Werror -O3
+CFLAGS  += -Werror -O3
 
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index f3597ee722a2f3fd87e79d96fe6f16c823628776..0cf48cd5da6cf2dabffa8031e692920b20d7b0e9 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -9,7 +9,7 @@ pae ?= n
 supervisor_mode_kernel ?= n
 
 CFLAGS  += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
-CFLAGS  += -iwithprefix include -Wall -Werror -Wno-pointer-arith -pipe
+CFLAGS  += -iwithprefix include -Werror -Wno-pointer-arith -pipe
 CFLAGS  += -I$(BASEDIR)/include 
 CFLAGS  += -I$(BASEDIR)/include/asm-x86/mach-generic
 CFLAGS  += -I$(BASEDIR)/include/asm-x86/mach-default